meson: gtk: install headers
authorTim-Philipp Müller <tim@centricular.com>
Mon, 20 Mar 2017 16:24:12 +0000 (16:24 +0000)
committerEmmanuele Bassi <ebassi@gnome.org>
Wed, 3 May 2017 14:10:54 +0000 (15:10 +0100)
gtk/a11y/meson.build
gtk/deprecated/meson.build
gtk/meson.build

index a3b789f07006b3491aa394009100f08d818bc456..7526343ce033d72a4dea019f1d1e7d0881171d63 100644 (file)
@@ -107,3 +107,4 @@ a11y_headers = files([
   'gtkwidgetaccessible.h',
   'gtkwindowaccessible.h',
 ])
+install_headers(a11y_headers, subdir : 'gtk-4.0/gtk/a11y')
index 2e0810565ab459e2a4f65c5dbabea8c1fee6125d..7e7916bcff5fe4e0d8aacfa1e522082bd5dacd8e 100644 (file)
@@ -1,3 +1,5 @@
 gtk_deprecated_sources = files([])
 
 gtk_deprecated_headers = files([])
+
+install_headers(gtk_deprecated_headers, subdir: 'gtk-4.0/gtk/deprecated/')
index e6caa1e46e8c3876e363eab22eac455c42a03a2e..70c7440f72dd5c90a8b6cca7798287cd392c235d 100644 (file)
@@ -595,6 +595,8 @@ gtk_public_headers = files([
   'gtkwindowgroup.h',
 ])
 
+install_headers(gtk_public_headers, subdir: 'gtk-4.0/gtk/')
+
 gtk_unix_sources = files([
   'gtkcustompaperunixdialog.c',
   'gtkpagesetupunixdialog.c',
@@ -668,7 +670,7 @@ gtktypebuiltins_h = custom_target(
   input   : gtk_public_headers + gtk_deprecated_headers,
   command : [mkenum, perl, glib_mkenums, meson.current_source_dir() + '/gtktypebuiltins.h.template', '@OUTPUT@', '@INPUT@'],
   install: true,
-  install_dir: 'include/gtk-4.0/gtk/' # XXX ???
+  install_dir: 'include/gtk-4.0/gtk/'
 )
 
 gtktypebuiltins_c = custom_target(
@@ -716,7 +718,7 @@ gtkversion = configure_file(
   input  : 'gtkversion.h.in',
   output : 'gtkversion.h',
   configuration: cdata,
-  install_dir: 'include/gtk-4.0/gtk/' # XXX ???
+  install_dir: 'include/gtk-4.0/gtk/'
 )
 
 gtk_cargs = [
@@ -787,13 +789,6 @@ endif
 
 gnome.compile_schemas()
 
-
-# Install necessary headers
-
-# install_headers(gtk_public_headers,     subdir: 'gtk-3.0/gtk/')
-# install_headers(gtk_deprecated_headers, subdir: 'gtk-3.0/gtk/deprecated/')
-# install_headers(a11y_headers,           subdir: 'gtk-3.0/gtk/a11y/')
-
 libgtk = shared_library('gtk',
   sources: [typefuncs, gtk_sources, gtkmarshal_h, gtkprivatetypebuiltins_h],
   c_args: gtk_cargs,